Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Thu, 11 Apr 2013 18:31:50 +0000 (14:31 -0400)
committerTom Rini <[email protected]>
Thu, 11 Apr 2013 18:31:50 +0000 (14:31 -0400)

Trivial merge